package cn.lzj;

public class Main {
    public static void main(String[] args) {
        System.out.println("Hello world!");
        System.out.println("hot-fix begin");
        System.out.println("Hello world!");
        System.out.println("hot-fix begin");
        System.out.println("Hello world!");
        System.out.println("hot-fix begin");
        System.out.println("master begin");
        System.out.println("conflict==================lzj-test-version1.2===============================");
        System.out.println("hot-fix22222 begin");
        System.out.println("push option first");
        System.out.println("pull from gitHub");
        System.out.println("pull from gitHub version1.0");

        System.out.println("push from gitee version1.1");
        System.out.println("conflict==================lzj-test-version1.3===============================");
        System.out.println("push from gitee version1.1");
        System.out.println("conflict test=================================================");

        System.out.println("conflict==================lzj-test-version1.4===============================\"");
        System.out.println("zsy001");

        System.out.println("conflict==================lzj-test-version1.5===============================\"");
        System.out.println("QuteZSY001");
        System.out.println("conflict==================lzj-test-version1.5 Update===============================\"");
        System.out.println("Update");
        System.out.println("2333333333");
        System.out.println("conflict==================lzj-test-version1.6 ===============================\"");
        System.out.println("overroll");

    }
}
